merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Wed, 26 Jul 2006 16:49:32 +0000 (10:49 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Wed, 26 Jul 2006 16:49:32 +0000 (10:49 -0600)

Trivial merge